Create barbican keystone listener deployment #34

mauricioharley · 2023-10-05T12:06:41Z

No description provided.

abays · 2023-10-23T10:57:51Z

controllers/barbican_controller.go

You'll want to add Owns(&barbicanv1beta1.BarbicanKeystoneListener{}) to the SetupWithManager() func

abays · 2023-10-23T11:02:25Z

controllers/barbican_controller.go

+		}
+
+		// Add a finalizer to prevent user from manually removing child BarbicanAPI
+		controllerutil.AddFinalizer(deployment, helper.GetFinalizer())


Since we're adding a finalizer to the BarbicanKeystoneListener resource, we will also need to remove the finalizer in our deletion logic. i.e. like we do here for the BarbicanAPI resource that this Barbican resource owns:

barbican-operator/controllers/barbican_controller.go

Lines 367 to 382 in ed7f9a3

// Remove finalizers from any existing child GlanceAPIs

barbicanAPI := &barbicanv1beta1.BarbicanAPI{}

err = r.Get(ctx, types.NamespacedName{Name: fmt.Sprintf("%s-api", instance.Name), Namespace: instance.Namespace}, barbicanAPI)

if err != nil && !k8s_errors.IsNotFound(err) {

return ctrl.Result{}, err

}

if err == nil {

if controllerutil.RemoveFinalizer(barbicanAPI, helper.GetFinalizer()) {

err = r.Update(ctx, barbicanAPI)

if err != nil && !k8s_errors.IsNotFound(err) {

return ctrl.Result{}, err

}

util.LogForObject(helper, fmt.Sprintf("Removed finalizer from BarbicanAPI %s", barbicanAPI.Name), barbicanAPI)

}

}

vakwetu · 2023-10-24T15:32:08Z

api/v1beta1/barbicankeystonelistener_types.go

+	// API endpoint
+	//APIEndpoints map[string]string `json:"apiEndpoint,omitempty"`


We can remove these lines - no api endpoint

vakwetu · 2023-10-24T15:32:31Z

api/v1beta1/barbicankeystonelistener_types.go

+type BarbicanKeystoneListenerStatus struct {
+	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
+	// Important: Run "make" to regenerate code after modifying this file
+	// ReadyCount of barbican API instances


barbican keystone listener

vakwetu · 2023-10-24T15:37:45Z

controllers/barbican_controller.go

+	// TODO(afaranha): Rename Keystone with Barbican
+	// We need to allow all KeystoneEndpoint and KeystoneService processing to finish
+	// in the case of a delete before we remove the finalizers.  For instance, in the
+	// case of the Memcached dependency, if Memcached is deleted before all Keystone
+	// cleanup has finished, then the Keystone logic will likely hit a 500 error and
+	// thus its deletion will hang indefinitely.
+	for _, finalizer := range instance.Finalizers {
+		// If this finalizer is not our KeystoneAPI finalizer, then it is either
+		// a KeystoneService or KeystoneEndpointer finalizer, which indicates that
+		// there is more Keystone processing that needs to finish before we can
+		// allow our DB and Memcached dependencies to be potentially deleted
+		// themselves
+		if finalizer != helper.GetFinalizer() {
+			return ctrl.Result{}, nil
+		}
+	}
+


Can you explain to me what this code is supposed to be doing?

vakwetu · 2023-10-24T15:41:42Z

pkg/barbicankeystonelistener/deployment.go

+	envVars := map[string]env.Setter{}
+	envVars["KOLLA_CONFIG_STRATEGY"] = env.SetValue("COPY_ALWAYS")
+	envVars["CONFIG_HASH"] = env.SetValue(configHash)
+	/*


Lets get rid of the commented out parts here. we'll have to figure out probes for these kinds of objects (listener, worker) later, but they won't be these kinds of probes

vakwetu · 2023-10-24T15:41:53Z

pkg/barbicankeystonelistener/deployment.go

+	args := []string{"-c"}
+	if instance.Spec.Debug.Service {
+		args = append(args, common.DebugCommand)
+		//livenessProbe.Exec = &corev1.ExecAction{


vakwetu · 2023-10-24T15:42:02Z

pkg/barbicankeystonelistener/deployment.go

+		//readinessProbe.Exec = livenessProbe.Exec
+	} else {
+		args = append(args, ServiceCommand)
+		//


vakwetu · 2023-10-24T15:42:25Z

pkg/barbicankeystonelistener/deployment.go

+							Env:          env.MergeEnvs([]corev1.EnvVar{}, envVars),
+							VolumeMounts: barbican.GetLogVolumeMount(),
+							Resources:    instance.Spec.Resources,
+							//ReadinessProbe: readinessProbe,


vakwetu · 2023-10-24T15:43:27Z

templates/barbican/config/00-default.conf

@@ -21,13 +21,13 @@ interface = internal
 {{ end }}

 [keystone_notifications]
-enable = false
+enable = true
 topic = notifications


I thought we decided to use topic = barbican_notifications so that barbican would get its own listening queue

vakwetu · 2023-10-24T15:44:12Z

templates/barbican/config/00-default.conf

-#driver=messagingv2
-driver=noop
+driver=messagingv2
+#driver=noop


delete line

vakwetu

A few nits and a change for the topic to barbican_notifications

mauricioharley force-pushed the barbican_keystone_listener branch 2 times, most recently from 64f9074 to 707b197 Compare October 10, 2023 09:15

mauricioharley force-pushed the barbican_keystone_listener branch 2 times, most recently from a2233ee to 22e3c2c Compare October 19, 2023 16:01

abays reviewed Oct 23, 2023

View reviewed changes

Mauricio Harley added 2 commits October 24, 2023 09:53

Create barbican keystone listener deployment

e0cf645

Add barbican keystone-listener finalizer

b0449e3

mauricioharley force-pushed the barbican_keystone_listener branch from 22e3c2c to b0449e3 Compare October 24, 2023 15:08

vakwetu reviewed Oct 24, 2023

View reviewed changes

templates/barbican/config/00-default.conf Outdated

#driver=messagingv2

driver=noop

driver=messagingv2

#driver=noop

Copy link

Contributor

vakwetu Oct 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

delete line

vakwetu requested changes Oct 24, 2023

View reviewed changes

mauricioharley force-pushed the barbican_keystone_listener branch from 73d7383 to 44ff70b Compare October 26, 2023 10:22

Add missing requeue and Owns

ed1aa45

mauricioharley force-pushed the barbican_keystone_listener branch from 44ff70b to ed1aa45 Compare October 31, 2023 14:37

vakwetu approved these changes Oct 31, 2023

View reviewed changes

vakwetu merged commit ba23837 into openstack-k8s-operators:main Oct 31, 2023
4 checks passed

xek mentioned this pull request Nov 2, 2023

Missing finalizers removal for barbican-worker barbican-keystone-listener #35

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Create barbican keystone listener deployment #34

Create barbican keystone listener deployment #34

mauricioharley commented Oct 5, 2023

abays Oct 23, 2023

abays Oct 23, 2023

vakwetu Oct 24, 2023

vakwetu Oct 24, 2023

vakwetu Oct 24, 2023

vakwetu Oct 24, 2023

vakwetu Oct 24, 2023

vakwetu Oct 24, 2023

vakwetu Oct 24, 2023

vakwetu Oct 24, 2023

vakwetu Oct 24, 2023

vakwetu left a comment

	// Remove finalizers from any existing child GlanceAPIs
	barbicanAPI := &barbicanv1beta1.BarbicanAPI{}
	err = r.Get(ctx, types.NamespacedName{Name: fmt.Sprintf("%s-api", instance.Name), Namespace: instance.Namespace}, barbicanAPI)
	if err != nil && !k8s_errors.IsNotFound(err) {
	return ctrl.Result{}, err
	}

	if err == nil {
	if controllerutil.RemoveFinalizer(barbicanAPI, helper.GetFinalizer()) {
	err = r.Update(ctx, barbicanAPI)
	if err != nil && !k8s_errors.IsNotFound(err) {
	return ctrl.Result{}, err
	}
	util.LogForObject(helper, fmt.Sprintf("Removed finalizer from BarbicanAPI %s", barbicanAPI.Name), barbicanAPI)
	}
	}

		// API endpoint
		//APIEndpoints map[string]string `json:"apiEndpoint,omitempty"`

Create barbican keystone listener deployment #34

Create barbican keystone listener deployment #34

Conversation

mauricioharley commented Oct 5, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vakwetu left a comment

Choose a reason for hiding this comment